Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

statistics: upgrade stats timeout checkpoint after it timeouts #52424

Merged
merged 3 commits into from
Apr 9, 2024
Merged

statistics: upgrade stats timeout checkpoint after it timeouts #52424

merged 3 commits into from
Apr 9, 2024

Conversation

hawkingrei
Copy link
Member

@hawkingrei hawkingrei commented Apr 8, 2024 •
edited
Loading

What problem does this PR solve?

Issue Number: close #52425

Problem Summary:

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. and removed do-not-merge/needs-linked-issue do-not-merge/needs-tests-checked labels Apr 8, 2024
@codecov Codecov
Copy link

codecov bot commented Apr 8, 2024 •
edited
Loading

Codecov Report

Merging #52424 (54524c4) into master (e79a26f) will increase coverage by 2.1516%.
Report is 4 commits behind head on master.
The diff coverage is 100.0000%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #52424        +/-   ##
================================================
+ Coverage   72.1823%   74.3340%   +2.1516%     
================================================
  Files          1467       1467                
  Lines        426895     426935        +40     
================================================
+ Hits         308143     317358      +9215     
+ Misses        99565      89735      -9830     
- Partials      19187      19842       +655
Flag Coverage Δ
integration 48.7191% <71.4285%> (?)
unit 70.9853% <100.0000%> (-0.0825%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9957% <ø> (ø)
parser ∅ <ø> (∅)
br 49.5781% <ø> (+8.6854%) ⬆️

@hawkingrei hawkingrei requested a review from winoros April 8, 2024 16:00
@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 8, 2024
@hawkingrei
Copy link
Member Author

/retest

@ti-chi-bot ti-chi-bot bot added size/S Denotes a PR that changes 10-29 lines, ignoring generated files. and removed approved size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. labels Apr 9, 2024
@easonn7
Copy link

easonn7 commented Apr 9, 2024

/approve

@ti-chi-bot ti-chi-bot bot added the approved label Apr 9, 2024
@ti-chi-bot ti-chi-bot added the needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. label Apr 9, 2024
@hawkingrei hawkingrei requested a review from AilinKid April 9, 2024 03:07
hawkingrei
hawkingrei commented Apr 9, 2024
View reviewed changes
pkg/sessionctx/variable/session.go
@@ -1307,7 +1307,7 @@ type SessionVars struct {
ReadConsistency ReadConsistencyLevel

// StatsLoadSyncWait indicates how long to wait for stats load before timeout.
StatsLoadSyncWait int64
StatsLoadSyncWait atomic.Int64
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Update it to resolve the data race problem.

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 9, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, easonn7, winoros

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Apr 9, 2024
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Apr 9, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-04-08 16:02:52.597447382 +0000 UTC m=+891834.124987925: ☑️ agreed by winoros.
  • 2024-04-09 03:54:54.214397679 +0000 UTC m=+934555.741938225: ☑️ agreed by AilinKid.

AilinKid
AilinKid reviewed Apr 9, 2024
View reviewed changes
pkg/statistics/handle/syncload/stats_syncload.go
@@ -396,7 +397,7 @@ func (*statsSyncLoad) readStatsForOneItem(sctx sessionctx.Context, item model.Ta
}

// drainColTask will hang until a column task can return, and either task or error will be returned.
func (s *statsSyncLoad) drainColTask(exit chan struct{}) (*statstypes.NeededItemTask, error) {
func (s *statsSyncLoad) drainColTask(sctx sessionctx.Context, exit chan struct{}) (*statstypes.NeededItemTask, error) {
Copy link
Contributor

@AilinKid AilinKid Apr 9, 2024 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

pass the limited scope arg is appreciated

@ti-chi-bot ti-chi-bot bot merged commit 9bb3697 into pingcap:master Apr 9, 2024
23 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #52436.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 9, 2024
@hawkingrei @ti-chi-bot
This is an automated cherry-pick of pingcap#52424
be10df0 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 9, 2024
Merged
13 tasks
@hawkingrei
Copy link
Member Author

/cherrypick release-7.1
/cherrypick release-6.5

@ti-chi-bot
Copy link
Member

@hawkingrei: new pull request created to branch release-6.5: #52438.

In response to this:

/cherrypick release-7.1
/cherrypick release-6.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 9, 2024
@hawkingrei @ti-chi-bot
This is an automated cherry-pick of pingcap#52424
5b416e1 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 9, 2024
Merged
13 tasks
@ti-chi-bot
Copy link
Member

@hawkingrei: new pull request created to branch release-7.1: #52439.

In response to this:

/cherrypick release-7.1
/cherrypick release-6.5

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the ti-community-infra/tichi repository.

ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Apr 9, 2024
@hawkingrei @ti-chi-bot
This is an automated cherry-pick of pingcap#52424
4677444 
Signed-off-by: ti-chi-bot <[email protected]>
@ti-chi-bot ti-chi-bot mentioned this pull request Apr 9, 2024
Merged
13 tasks
ti-chi-bot bot pushed a commit that referenced this pull request Apr 15, 2024
@ti-chi-bot
statistics: upgrade stats timeout checkpoint after it timeouts (#52424)…
6ee2141 
… (#52439)

close #52425
@hawkingrei hawkingrei deleted the timeout_checkpoint_check branch May 16, 2024 08:44
ti-chi-bot bot pushed a commit that referenced this pull request May 16, 2024
@ti-chi-bot
statistics: upgrade stats timeout checkpoint after it timeouts (#52424)…
19b3128 
… (#52436)

close #52425
hawkingrei added a commit to ti-chi-bot/tidb that referenced this pull request Jun 5, 2024
@hawkingrei
This is an automated cherry-pick of pingcap#52424
64a78d7 
Signed-off-by: ti-chi-bot <[email protected]>
ti-chi-bot bot pushed a commit that referenced this pull request Jun 5, 2024
@ti-chi-bot
statistics: upgrade stats timeout checkpoint after it timeouts (#52424)…
f4a3c5e 
… (#52438)

close #52425
hawkingrei pushed a commit to hawkingrei/tidb that referenced this pull request Jul 1, 2024
@ti-chi-bot @hawkingrei
statistics: upgrade stats timeout checkpoint after it timeouts (pingc…
a78b54e 
…ap#52424) (pingcap#52438)

close pingcap#52425
hawkingrei pushed a commit to hawkingrei/tidb that referenced this pull request Sep 4, 2024
@ti-chi-bot @hawkingrei
statistics: upgrade stats timeout checkpoint after it timeouts (pingc…
30698ad 
…ap#52424) (pingcap#52439)

close pingcap#52425
hawkingrei pushed a commit to hawkingrei/tidb that referenced this pull request Sep 4, 2024
@ti-chi-bot @hawkingrei
statistics: upgrade stats timeout checkpoint after it timeouts (pingc…
9115d9c 
…ap#52424) (pingcap#52439)

close pingcap#52425
@hawkingrei hawkingrei mentioned this pull request Sep 4, 2024
Merged
13 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid approved these changes

@winoros winoros winoros approved these changes

Assignees
No one assigned
Labels
approved lgtm needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. release-note-none Denotes a PR that doesn't merit a release note. size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

forget to upgrade the time after the load stats timeout
5 participants
@hawkingrei @easonn7 @ti-chi-bot @winoros @AilinKid